auto merge of #732 : alexcrichton/cargo/update, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 21 Oct 2014 16:04:11 +0000 (16:04 +0000)
committerbors <bors@rust-lang.org>
Tue, 21 Oct 2014 16:04:11 +0000 (16:04 +0000)
Also merge some other PRs while I'm at it


Trivial merge